Fix editor state leaking when switching automations, scripts, or scenes - #53826
Merged
Conversation
Recreate the page when the item id in the route changes so YAML mode, undo history, and scene live state cannot carry over to the next item.
Path-shape matching remounted nested config routers, Lovelace, and developer tools. Recreate only where edit/show routes opt in.
A remounted editor starts in review; disconnect only needs to drop the subscription, not undo device changes from live mode.
MindFreeze
marked this pull request as ready for review
August 27, 2026 10:23
Member
|
This means that when saving an automation for the first time (from new -> id) also recreates the editor? |
bramkragten
reviewed
Aug 27, 2026
| oldTail !== newTail | ||
| ) { | ||
| delete this._cache[newPage]; | ||
| this._createPanel(routerOptions, newPage, routeOptions); |
Member
There was a problem hiding this comment.
I think this should not just create the panel? It skips the loading screen right now, and a dynamically imported panel would fail?
Member
Author
There was a problem hiding this comment.
Changing it to go through load
bramkragten
reviewed
Aug 27, 2026
| routeOptions.itemId && | ||
| oldTail !== newTail | ||
| ) { | ||
| delete this._cache[newPage]; |
Member
There was a problem hiding this comment.
It will never be in the cache anyway right?
Member
Author
Yes, we will get a repaint. I think that's ok |
Member
|
For the scene editor, probably unrelated to this PR, but shouldn't leaving the page also call |
Member
Author
Will create a follow up PR for this |
Clear the current page instead of calling _createPanel directly so load and the loading screen still run. Drop the redundant cache delete.
12 tasks
bramkragten
previously approved these changes
Aug 27, 2026
Nested submit/cancel schedules a nextRender callback that ran after Vitest tore down HTMLElement, failing CI with an unhandled rejection.
bramkragten
approved these changes
Aug 27, 2026
bramkragten
added a commit
that referenced
this pull request
Aug 27, 2026
…es (#53826) * Fix editor state leaking when switching automations, scripts, or scenes Recreate the page when the item id in the route changes so YAML mode, undo history, and scene live state cannot carry over to the next item. * Declare itemId on editor routes instead of guessing from the path Path-shape matching remounted nested config routers, Lovelace, and developer tools. Recreate only where edit/show routes opt in. * Do not restore scene live states when the editor is torn down A remounted editor starts in review; disconnect only needs to drop the subscription, not undo device changes from live mode. * Use the normal create path when remounting itemId pages Clear the current page instead of calling _createPanel directly so load and the loading screen still run. Drop the redundant cache delete. * Fix dialog-form tests leaking focus restore after jsdom teardown Nested submit/cancel schedules a nextRender callback that ran after Vitest tore down HTMLElement, failing CI with an unhandled rejection.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed change
Opening another automation, script, or scene while already editing one reused the same editor element, so YAML mode, undo history, pending registry edits, and scene live control could carry over. Saving could then write the previous item's content onto the newly opened item.
HassRouterPagenow recreates the page when the remaining path is a single item id and that id changes. Those pages are also not cached. Nested routers (for exampleha-config-automation) stay in place so cached dashboards survive. In-flight editor loads are ignored after disconnect, and a scene editor in live mode restores stored states when it is torn down.Saving a new item remounts as well, so YAML mode is not kept after the first save.
Type of change
Additional information
Checklist
If user exposed functionality or configuration variables are added/changed:
To help with the load of incoming pull requests: